Use gtk_scrolled_window_set_child throughout

Replace all uses of gtk_container_add on popovers
by gtk_scrolled_window_set_child.

diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index 4093a392760e7f84af89b4b4cb93360b01a55891..b2c1a307dad084803d314a1685c628f310706be9 100644 (file)
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -474,7 +474,7 @@ do_dnd (GtkWidget *do_widget)
 
       box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_add_css_class (box3, "linked");
-      gtk_container_add (GTK_CONTAINER (sw), box3);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box3);
 
       for (i = 0; colors[i]; i++)
         {

diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index 52a432b3444de541ae485cc35e4d899577fc1e47..5a559a674c28881ce31e4b8d01188f1a8907dff0 100644 (file)
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -387,7 +387,7 @@ do_editable_cells (GtkWidget *do_widget)
       g_object_unref (numbers_model);
       g_object_unref (items_model);
 
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
       /* some buttons */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);

diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c
index cc9691ab7d7d9079bf91d059bae1793f50c2804f..78cb3fb27187ba9d81d4903f113aad2b5b885a61 100644 (file)
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -78,7 +78,7 @@ do_expander (GtkWidget *do_widget)
                                 "A second paragraph will contain even more "
                                 "innuendo, just to make you scroll down or "
                                 "resize the window. Do it already !", -1);
-      gtk_container_add (GTK_CONTAINER (sw), tv);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
       gtk_container_add (GTK_CONTAINER (expander), sw);
       gtk_container_add (GTK_CONTAINER (area), expander);
       g_signal_connect (expander, "notify::expanded",

diff --git a/demos/gtk-demo/fixed.c b/demos/gtk-demo/fixed.c
index cf1d642f20b994c17c4c3a24317736d91b3357ef..7c739030a63b483ea4d2607cdaac8fd9619fc505 100644 (file)
--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -134,7 +134,7 @@ create_demo_window (GtkWidget *do_widget)
   gtk_container_add (GTK_CONTAINER (window), sw);
 
   fixed = gtk_fixed_new ();
-  gtk_container_add (GTK_CONTAINER (sw), fixed);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), fixed);
   gtk_widget_set_halign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
   gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
 

diff --git a/demos/gtk-demo/flowbox.c b/demos/gtk-demo/flowbox.c
index 09acaf42f903e53b29094d92f16220faf47fa0f1..c9e2f255b493002a8dac2a911c0bb5e9e7e7ea9d 100644 (file)
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -735,7 +735,7 @@ do_flowbox (GtkWidget *do_widget)
       gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (flowbox), 30);
       gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (flowbox), GTK_SELECTION_NONE);
 
-      gtk_container_add (GTK_CONTAINER (scrolled), flowbox);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), flowbox);
       gtk_container_add (GTK_CONTAINER (window), scrolled);
 
       for (i = 0; colors[i]; i++)

diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 9958d9b21aa135b1217f579c62bf7992b1c37fc7..81a19e33054418081efd010607bbb8540f2b9b00 100644 (file)
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -267,7 +267,7 @@ do_hypertext (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
       gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
 
       show_page (buffer, 1);
     }

diff --git a/demos/gtk-demo/iconscroll.c b/demos/gtk-demo/iconscroll.c
index e2f0edd525c92ef2a1d375d0875264946ff6a71b..2254aa0bef6d56f996b8b8ab4e1854491e770eb4 100644 (file)
--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -66,9 +66,9 @@ populate_icons (void)
   hincrement = 0;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                 GTK_POLICY_NEVER,
-                                 GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), grid);
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), grid);
 }
 
 static char *content;
@@ -102,9 +102,9 @@ populate_text (gboolean hilight)
   hincrement = 0;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                 GTK_POLICY_NEVER,
-                                 GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
 }
 
 static void
@@ -126,9 +126,9 @@ populate_image (void)
   hincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                 GTK_POLICY_AUTOMATIC,
-                                 GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), image);
 }
 
 static void
@@ -137,9 +137,8 @@ set_widget_type (int type)
   if (tick_cb)
     gtk_widget_remove_tick_callback (window, tick_cb);
 
-  if (gtk_bin_get_child (GTK_BIN (scrolledwindow)))
-    gtk_container_remove (GTK_CONTAINER (scrolledwindow),
-                          gtk_bin_get_child (GTK_BIN (scrolledwindow)));
+  if (gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (scrolledwindow)))
+    gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), NULL);
 
   selected = type;
 

diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index 98ee9e03e6191f49f1a38f8ab717b183812fd433..8a6372d1199a65d6fe1cd779c4ecc69b07e74586 100644 (file)
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -312,7 +312,7 @@ do_iconview (GtkWidget *do_widget)
       /* Connect to the "item-activated" signal */
       g_signal_connect (icon_view, "item-activated",
                         G_CALLBACK (item_activated), store);
-      gtk_container_add (GTK_CONTAINER (sw), icon_view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), icon_view);
 
       gtk_widget_grab_focus (icon_view);
     }

diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index a75cca1854736a2921332f4929aefa94985ac11e..27815802ca0e6853f583e113430d131fabe62888 100644 (file)
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -289,7 +289,7 @@ do_list_store (GtkWidget *do_widget)
 
       g_object_unref (model);
 
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
       /* add columns to the tree view */
       add_columns (GTK_TREE_VIEW (treeview));

diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index 6b9f3cf5d9005ccfed06c5ae70abbc653567ba6c..d988ec5e6587becf2b7fd96e819e5e8b6c5c98eb 100644 (file)
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -368,7 +368,7 @@ do_listbox (GtkWidget *do_widget)
       gtk_widget_set_vexpand (scrolled, TRUE);
       gtk_container_add (GTK_CONTAINER (vbox), scrolled);
       listbox = gtk_list_box_new ();
-      gtk_container_add (GTK_CONTAINER (scrolled), listbox);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), listbox);
 
       gtk_list_box_set_sort_func (GTK_LIST_BOX (listbox), (GtkListBoxSortFunc)gtk_message_row_sort, listbox, NULL);
       gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (listbox), FALSE);

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 524221b915c602e222cb43ab56697f13136c7da6..a16c9398ffed92c1a3c040a548070778a2473aa8 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -571,7 +571,7 @@ display_image (const char *resource)
   gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (sw), image);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);
 
   return sw;
 }
@@ -614,7 +614,7 @@ display_text (const char *resource)
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (sw), textview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), textview);
 
   return sw;
 }

diff --git a/demos/gtk-demo/markup.c b/demos/gtk-demo/markup.c
index cb5ec505a02a37313ba88c3335b1bb52ada3c89f..a9a0eaf11bc3e25e0f852de4910d074c55fad859 100644 (file)
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -86,7 +86,7 @@ do_markup (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (sw), view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
 
       gtk_stack_add_named (GTK_STACK (stack), sw, "formatted");
 
@@ -99,7 +99,7 @@ do_markup (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (sw), view2);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view2);
 
       gtk_stack_add_named (GTK_STACK (stack), sw, "source");
 

diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay2.c
index ac2b1fafa2f6eb26d943ac07aa4d3eaf61b30be9..b990701944baf7709d697360c3a917aa35bf88a0 100644 (file)
--- a/demos/gtk-demo/overlay2.c
+++ b/demos/gtk-demo/overlay2.c
@@ -59,7 +59,7 @@ do_overlay2 (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (window), overlay);
       gtk_container_add (GTK_CONTAINER (overlay), sw);
-      gtk_container_add (GTK_CONTAINER (sw), text);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c
index b4d0e991e0b1c626232a665da8dd24e1bf5d6940..00c2a765e4358a177cba025c41bf9e5864153328 100644 (file)
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -424,7 +424,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_media_stream_play (media);
       add_choice (choices, GDK_PAINTABLE (media));
       sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (sw), choices);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), choices);
       gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1);
 
       label = gtk_label_new ("Size");

diff --git a/demos/gtk-demo/tabs.c b/demos/gtk-demo/tabs.c
index 877d1e7c58d8e825085443459cde59be6037d297..034b60a566aefd545b709670d314e1fc51448b07 100644 (file)
--- a/demos/gtk-demo/tabs.c
+++ b/demos/gtk-demo/tabs.c
@@ -47,7 +47,7 @@ do_tabs (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
       gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
     }
 
   if (!gtk_widget_get_visible (window))

diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index 08afc0ede5a10e4644cdaedb8b611502c4981489..ccd5d521b15815e12caf8619106e016c10c64db2 100644 (file)
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -159,7 +159,7 @@ create_text_view (GtkWidget *hbox,
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_add (GTK_CONTAINER (hbox), swindow);
   textview = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (swindow), textview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview);
 
   timeout = setup_scroll (GTK_TEXT_VIEW (textview), to_end);
 

diff --git a/demos/gtk-demo/textundo.c b/demos/gtk-demo/textundo.c
index 770ec1cfbb966c3739bf5c1befc78e1d8c43d6e8..fb3a03e4424c47141c5270439675a6191f7e76ca 100644 (file)
--- a/demos/gtk-demo/textundo.c
+++ b/demos/gtk-demo/textundo.c
@@ -54,7 +54,7 @@ do_textundo (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
       gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
     }
 
   if (!gtk_widget_get_visible (window))

diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index d5aed9b08be4deba0cd6cd99640f7bcbca80ff1a..0acc03e9e202a527c8419ff099f57a32055fa885 100644 (file)
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -503,7 +503,7 @@ do_textview (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC);
       gtk_paned_add1 (GTK_PANED (vpaned), sw);
 
-      gtk_container_add (GTK_CONTAINER (sw), view1);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view1);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -511,7 +511,7 @@ do_textview (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC);
       gtk_paned_add2 (GTK_PANED (vpaned), sw);
 
-      gtk_container_add (GTK_CONTAINER (sw), view2);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view2);
 
       create_tags (buffer);
       insert_text (GTK_TEXT_VIEW (view1));
@@ -595,7 +595,7 @@ easter_egg_callback (GtkWidget *button,
                                   GTK_POLICY_AUTOMATIC);
 
   gtk_container_add (GTK_CONTAINER (window), sw);
-  gtk_container_add (GTK_CONTAINER (sw), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
 
   window_ptr = &window;
   g_object_add_weak_pointer (G_OBJECT (window), window_ptr);

diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 7b01ab2a5ede57a453818c773043d22bd77c4c51..f404fcc7578c0150a7a2f899f5d678e875371f28 100644 (file)
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -426,7 +426,7 @@ do_tree_store (GtkWidget *do_widget)
 
       add_columns (GTK_TREE_VIEW (treeview));
 
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
       /* expand all rows after the treeview widget has been realized */
       g_signal_connect (treeview, "realize",

diff --git a/docs/reference/gtk/getting_started.xml.in b/docs/reference/gtk/getting_started.xml.in
index a686eccddedd4e0aa5cf5c4eb5557d7a8011f69c..3f2405caa4bb4334e7a92ae56bf4f603a8089e59 100644 (file)
--- a/docs/reference/gtk/getting_started.xml.in
+++ b/docs/reference/gtk/getting_started.xml.in
@@ -551,7 +551,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 7b729fc2d9b5c00c3c1c2242686b68146115d9a4..c411460b4e34ab2c42f062d5864add9e92551a6a 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -876,7 +876,7 @@ create_scrolledwindow (void)
                                   GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
   label = gtk_label_new ("Scrolled Window");
 
-  gtk_container_add (GTK_CONTAINER (scrolledwin), label);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwin), label);
 
   return new_widget_info ("scrolledwindow", scrolledwin, MEDIUM);
 }

diff --git a/examples/application10/exampleappwin.c b/examples/application10/exampleappwin.c
index 31f527b128ab736c6f44189a082db9b428d0e795..16a8658f36296752d2d164cd1b97245ef3975304 100644 (file)
--- a/examples/application10/exampleappwin.c
+++ b/examples/application10/exampleappwin.c
@@ -37,7 +37,7 @@ search_text_changed (GtkEntry         *entry,
     return;
 
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   /* Very simple-minded search implementation */
@@ -77,7 +77,7 @@ update_words (ExampleAppWindow *win)
   if (tab == NULL)
     return;
 
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   strings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -130,7 +130,7 @@ update_lines (ExampleAppWindow *win)
   if (tab == NULL)
     return;
 
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   count = gtk_text_buffer_get_line_count (buffer);
@@ -266,7 +266,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

diff --git a/examples/application3/exampleappwin.c b/examples/application3/exampleappwin.c
index 01fb4ae115f81b0226d43df1f9d57d5fc9d26e57..9ed0b88452efc01877625e2836cd3c512906e58c 100644 (file)
--- a/examples/application3/exampleappwin.c
+++ b/examples/application3/exampleappwin.c
@@ -49,7 +49,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))

diff --git a/examples/application4/exampleappwin.c b/examples/application4/exampleappwin.c
index 01fb4ae115f81b0226d43df1f9d57d5fc9d26e57..9ed0b88452efc01877625e2836cd3c512906e58c 100644 (file)
--- a/examples/application4/exampleappwin.c
+++ b/examples/application4/exampleappwin.c
@@ -49,7 +49,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))

diff --git a/examples/application5/exampleappwin.c b/examples/application5/exampleappwin.c
index ca45b85d40e60df5757aacc5c0b852b661eee196..16d11f4c70440e5644e436b6db9234d4a92f42e7 100644 (file)
--- a/examples/application5/exampleappwin.c
+++ b/examples/application5/exampleappwin.c
@@ -72,7 +72,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

diff --git a/examples/application6/exampleappwin.c b/examples/application6/exampleappwin.c
index ca45b85d40e60df5757aacc5c0b852b661eee196..16d11f4c70440e5644e436b6db9234d4a92f42e7 100644 (file)
--- a/examples/application6/exampleappwin.c
+++ b/examples/application6/exampleappwin.c
@@ -72,7 +72,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

diff --git a/examples/application7/exampleappwin.c b/examples/application7/exampleappwin.c
index d4a671cc457b06209beed82a954b572c9ee3162f..f15cf3ba42838f573a41fdc0482f65634b3e2401 100644 (file)
--- a/examples/application7/exampleappwin.c
+++ b/examples/application7/exampleappwin.c
@@ -31,7 +31,7 @@ search_text_changed (GtkEntry         *entry,
     return;
 
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   /* Very simple-minded search implementation */
@@ -125,7 +125,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

diff --git a/examples/application8/exampleappwin.c b/examples/application8/exampleappwin.c
index f662b67cbb181223a503a9e03e7694e23a427f51..f21eeec5cc7b60506ed148235f26d9d29a42e933 100644 (file)
--- a/examples/application8/exampleappwin.c
+++ b/examples/application8/exampleappwin.c
@@ -35,7 +35,7 @@ search_text_changed (GtkEntry         *entry,
     return;
 
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   /* Very simple-minded search implementation */
@@ -75,7 +75,7 @@ update_words (ExampleAppWindow *win)
   if (tab == NULL)
     return;
 
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   strings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -229,7 +229,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

diff --git a/examples/application9/exampleappwin.c b/examples/application9/exampleappwin.c
index 0394904d76ddc12e3f92440c0b524e7b793629a0..725ee67df1e4c69a1b18a94cc9b187c59d4c18a4 100644 (file)
--- a/examples/application9/exampleappwin.c
+++ b/examples/application9/exampleappwin.c
@@ -37,7 +37,7 @@ search_text_changed (GtkEntry         *entry,
     return;
 
   tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   /* Very simple-minded search implementation */
@@ -77,7 +77,7 @@ update_words (ExampleAppWindow *win)
   if (tab == NULL)
     return;
 
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   strings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -130,7 +130,7 @@ update_lines (ExampleAppWindow *win)
   if (tab == NULL)
     return;
 
-  view = gtk_bin_get_child (GTK_BIN (tab));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   count = gtk_text_buffer_get_line_count (buffer);
@@ -263,7 +263,7 @@ example_app_window_open (ExampleAppWindow *win,
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

diff --git a/examples/bp/bloatpad.c b/examples/bp/bloatpad.c
index f8f48d4fc96d0111bf2c8b3b9fc65994aca77463..3cb619eb8fbe37dfb0952b27bce3ec085371c71d 100644 (file)
--- a/examples/bp/bloatpad.c
+++ b/examples/bp/bloatpad.c
@@ -259,7 +259,7 @@ new_window (GApplication *app,
 
   g_object_set_data ((GObject*)window, "bloatpad-text", view);
 
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
 
   gtk_grid_attach (GTK_GRID (grid), scrolled, 0, 1, 1, 1);
 

diff --git a/examples/plugman.c b/examples/plugman.c
index d36b28bfb145387b6be18fe7a93f227a1d76347a..1b33f0eeb46f2197ed1d5d0a6340d50492edd86d 100644 (file)
--- a/examples/plugman.c
+++ b/examples/plugman.c
@@ -92,7 +92,7 @@ new_window (GApplication *app,
 
   g_object_set_data ((GObject*)window, "plugman-text", view);
 
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
 
   gtk_grid_attach (GTK_GRID (grid), scrolled, 0, 0, 1, 1);
 

diff --git a/examples/sunny.c b/examples/sunny.c
index 7aa4a9f89ec4a18a38159ae5e787c8d5df351612..86d4d73fc0af9e6b6d983faf55bc7cac662a8858 100644 (file)
--- a/examples/sunny.c
+++ b/examples/sunny.c
@@ -26,7 +26,7 @@ new_window (GApplication *app,
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
 
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
   gtk_container_add (GTK_CONTAINER (overlay), scrolled);
 
   if (file != NULL)

diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index d6a87cdf6fa6f8049aa8768b62b45d6a25d2d08f..e664c595cdb1bf8edda1b681ba1c22808c3b6ca5 100644 (file)
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -1045,7 +1045,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
 
-  gtk_container_add (GTK_CONTAINER (scrolled), treeview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), treeview);
   gtk_widget_show (treeview);
 
   toolbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 5ab7fb828ad5d6f27e3ca718928eb82863e1d4e0..2aa691fe65b7bf791870c4b65874b2acb24967e2 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -605,7 +605,8 @@ gtk_entry_completion_constructed (GObject *object)
   priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_frame_set_child (GTK_FRAME (popup_frame), priv->vbox);
 
-  gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (priv->scrolled_window),
+                                 priv->tree_view);
   gtk_widget_set_hexpand (priv->scrolled_window, TRUE);
   gtk_widget_set_vexpand (priv->scrolled_window, TRUE);
   gtk_container_add (GTK_CONTAINER (priv->vbox), priv->scrolled_window);

diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index d1eb782079b2e02b4f103a0527f5bb3235f8193c..e58bae6ac6122c604899672683c0c5f1bf7f75a7 100644 (file)
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -1591,7 +1591,7 @@ create_show_processes_dialog (GtkMountOperation *op,
                                   GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
 
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
   gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);
 
   controller = gtk_shortcut_controller_new ();

diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 6ba5cd3a5cb65b5aacfd37522de980f5e99ba85a..178c3bde666f6d60d95a62165fec70014e3e5ff9 100644 (file)
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -3810,7 +3810,7 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
   sidebar->row_placeholder = NULL;
   sidebar->dragging_over = FALSE;
 
-  gtk_container_add (GTK_CONTAINER (sidebar->swin), sidebar->list_box);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sidebar->swin), sidebar->list_box);
 
   sidebar->hostname = g_strdup (_("Computer"));
   sidebar->hostnamed_cancellable = g_cancellable_new ();

diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 168dce4dc178dd23789b95a7a2db62928965893c..375086e15956bb4b149c776287ebdd15a014a3eb 100644 (file)
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -972,14 +972,13 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
                            self,
                            G_CONNECT_SWAPPED);
 
-  scroller = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
-                           NULL);
+  scroller = gtk_scrolled_window_new (NULL, NULL);
   box = g_object_new (GTK_TYPE_BOX,
                       "halign", GTK_ALIGN_CENTER,
                       "orientation", GTK_ORIENTATION_VERTICAL,
                       NULL);
   gtk_widget_add_css_class (GTK_WIDGET (box), "shortcuts-search-results");
-  gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (box));
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scroller), GTK_WIDGET (box));
   gtk_stack_add_named (priv->stack, scroller, "internal-search");
 
   priv->search_shortcuts = g_object_new (GTK_TYPE_BOX,

diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c
index 84953d78458eca1b7b05c8b1f39a65ef625cdb92..8dfed9c749e4a43f92247c9463738c134dae9f9b 100644 (file)
--- a/gtk/gtkstacksidebar.c
+++ b/gtk/gtkstacksidebar.c
@@ -166,7 +166,7 @@ gtk_stack_sidebar_init (GtkStackSidebar *self)
 
   self->list = GTK_LIST_BOX (gtk_list_box_new ());
 
-  gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (self->list));
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), GTK_WIDGET (self->list));
 
   gtk_list_box_set_header_func (self->list, update_header, self, NULL);
 

diff --git a/gtk/inspector/controllers.c b/gtk/inspector/controllers.c
index 280fbe9154841902edb4d8d7457174a6f5355add..95b9ff3efa8b0a1844f224251e507709fc871c3c 100644 (file)
--- a/gtk/inspector/controllers.c
+++ b/gtk/inspector/controllers.c
@@ -80,7 +80,7 @@ gtk_inspector_controllers_init (GtkInspectorControllers *sl)
                 "margin-top", 60,
                 "margin-bottom", 30,
                 NULL);
-  gtk_container_add (GTK_CONTAINER (sw), box);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box);
   gtk_widget_set_hexpand (box, TRUE);
   gtk_widget_set_vexpand (box, TRUE);
 

diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index 04c8d20dee321a801bcdd04c71cccbd8fa1f39df..94d4577c6d95f75dff11858e9f11553a23e9c2fa 100644 (file)
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -41,6 +41,7 @@
 #include "gtkspinbutton.h"
 #include "gtksettingsprivate.h"
 #include "gtktogglebutton.h"
+#include "gtkviewport.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtklistbox.h"
@@ -574,7 +575,7 @@ flags_changed (GObject *object, GParamSpec *pspec, gpointer data)
 
   popover = gtk_menu_button_get_popover (GTK_MENU_BUTTON (data));
   sw =  gtk_popover_get_child (GTK_POPOVER (popover));
-  viewport = gtk_bin_get_child (GTK_BIN (sw));
+  viewport = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (sw));
   box = gtk_viewport_get_child (GTK_VIEWPORT (viewport));
   children = gtk_container_get_children (GTK_CONTAINER (box));
 
@@ -957,7 +958,7 @@ property_editor (GObject                *object,
                       NULL);
         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_show (box);
-        gtk_container_add (GTK_CONTAINER (sw), box);
+        gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box);
 
         fclass = G_FLAGS_CLASS (g_type_class_ref (spec->value_type));
 
@@ -1034,7 +1035,7 @@ property_editor (GObject                *object,
       gtk_list_box_bind_model (GTK_LIST_BOX (box), model, create_row, editor, NULL);
       g_object_unref (model);
 
-      gtk_container_add (GTK_CONTAINER (sw), box);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box);
     }
   else if (type == G_TYPE_PARAM_OBJECT)
     {

diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index bc7a9c869fe0f9f76ec76b840b41036d5993ca67..4c5bb0725d3c9419bdec188cbf9905ad15eb5890 100644 (file)
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -233,7 +233,7 @@ main (int argc, char *argv[])
 
   extra_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
   gtk_box_set_spacing (GTK_BOX (extra_hbox), 6);
-  gtk_container_add (GTK_CONTAINER (scrolled), extra_hbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), extra_hbox);
   gtk_widget_show (extra_hbox);
 
   bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

diff --git a/tests/listmodel.c b/tests/listmodel.c
index ee61a053f0a95489682be1396eb1071513ce2d8d..f4d88fe4779333696e02e36c89f42096c76276c8 100644 (file)
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
 
   box = gtk_list_box_new ();
   gtk_list_box_bind_model (GTK_LIST_BOX (box), G_LIST_MODEL (store), create_widget, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (sw), box);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -215,7 +215,7 @@ main (int argc, char *argv[])
 
   box = gtk_flow_box_new ();
   gtk_flow_box_bind_model (GTK_FLOW_BOX (box), G_LIST_MODEL (store), create_widget, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (sw), box);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box);
 
   button = gtk_button_new_with_label ("Add some");
   g_signal_connect (button, "clicked", G_CALLBACK (add_some), store);

diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index 933ab3e892fc27a4f39f01eee8f50c5bcbeedc7f..4cb8e18f4668a8384cce43151442771596b50bf8 100644 (file)
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
 
   tv = gtk_text_view_new ();
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (tv), GTK_WRAP_WORD);
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
   gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv)),
                             content, -1);
   g_free (content);

diff --git a/tests/print-editor.c b/tests/print-editor.c
index 32d522ae8f8c675faaee316b4db63914be5ccc73..a0a8fde4ee38c755209c95a5cc62261a2d30985b 100644 (file)
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -765,7 +765,7 @@ activate (GApplication *app)
   contents = gtk_text_view_new ();
   gtk_widget_grab_focus (contents);
 
-  gtk_container_add (GTK_CONTAINER (sw),
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw),
                      contents);
 
   /* Create statusbar */

diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c
index c47e834fb7a7dddcd4d48fec1641f381c8472440..db2fae820ea592c948826ee4c07d814d2c9cf41d 100644 (file)
--- a/tests/scrolling-performance.c
+++ b/tests/scrolling-performance.c
@@ -135,7 +135,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (window), scrolled_window);
 
   viewport = gtk_viewport_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), viewport);
 
   grid = gtk_grid_new ();
   gtk_viewport_set_child (GTK_VIEWPORT (viewport), grid);

diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index 715fc0ae32f42673d68d990c9e799dcbd6351dc0..aae34874135a929d181bbe6a4f7e4dbb32c0f0c3 100644 (file)
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -35,7 +35,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (box), sw);
   tv = gtk_text_view_new ();
   fill_text_view (tv, "Left");
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
   adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw));
 
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (box), sw);
   tv = gtk_text_view_new ();
   fill_text_view (tv, "Middle");
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
   sw = gtk_scrolled_window_new (NULL, adj);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (box), sw);
   tv = gtk_text_view_new ();
   fill_text_view (tv, "Right");
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
   sb = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, adj);
 

diff --git a/tests/testaccel.c b/tests/testaccel.c
index d07048cd24dc055b8b93f00162c4e165cb187025..0dc121d7b537d7af9aa8bb574c36efd68e56c6dd 100644 (file)
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -79,7 +79,7 @@ key_test (void)
 
        store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_UINT);
        tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
-       gtk_container_add (GTK_CONTAINER (sw), tv);
+       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
        column = gtk_tree_view_column_new ();
        rend = gtk_cell_renderer_accel_new ();
        g_object_set (G_OBJECT (rend),

diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index 8c95ad55d580843bdcada83229b5694d2618dbc1..c5ec0a08cec75e7e6871f1d7e5dfb6ac6a0fdd53 100644 (file)
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -181,7 +181,7 @@ create_tree (gboolean rtl)
 
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
   gtk_widget_set_direction (treeview, rtl ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
-  gtk_container_add (GTK_CONTAINER (sw), treeview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
   /* Line number */
 

diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c
index da812f6782c52ee74795d24b480b0fd07e0837a4..7ea34e9bf7f6f3b4bba33609bbdb68b62acd8372 100644 (file)
--- a/tests/testclipboard2.c
+++ b/tests/testclipboard2.c
@@ -253,7 +253,7 @@ get_formats_list (GdkClipboard *clipboard)
   list = gtk_list_box_new ();
   g_signal_connect_object (clipboard, "notify::formats", G_CALLBACK (clipboard_formats_change_cb), list, 0);
   clipboard_formats_change_cb (clipboard, NULL, list);
-  gtk_container_add (GTK_CONTAINER (sw), list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
 
   return sw;
 }

diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index bdaadf19ca7458d509c05067bed618c1705770d1..57f2c5bdd9cf005008644303406f90885679ee5c 100644 (file)
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -274,13 +274,13 @@ main (int argc, char **argv)
   gtk_widget_set_hexpand (scrolled_window, TRUE);
   gtk_container_add (GTK_CONTAINER (hbox), scrolled_window);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   text_view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
 
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), text_view);
 
   button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_add (GTK_CONTAINER (hbox), button_vbox);

diff --git a/tests/testdnd3.c b/tests/testdnd3.c
index 34d2386f1bf7ca692382613a3ceb9b1b169f9b1a..6234799b00285ff78beeae7a5a4b0107fc89cf22 100644 (file)
--- a/tests/testdnd3.c
+++ b/tests/testdnd3.c
@@ -301,7 +301,7 @@ int main (int argc, char *argv[])
 
   box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_add_css_class (box3, "linked");
-  gtk_container_add (GTK_CONTAINER (sw), box3);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box3);
 
   for (i = 0; colors[i]; i++)
     {

diff --git a/tests/testexpander.c b/tests/testexpander.c
index ba99e80a44758bc8a3e336b606bd902cb60c6f39..a56cddd10dace9f5bc7619930a1bad9e21ec39f4 100644 (file)
--- a/tests/testexpander.c
+++ b/tests/testexpander.c
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
                             "A second paragraph will contain even more "
                             "innuendo, just to make you scroll down or "
                             "resize the window. Do it already !", -1);
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
   gtk_container_add (GTK_CONTAINER (expander), sw);
   gtk_widget_set_hexpand (expander, TRUE);
   gtk_widget_set_vexpand (expander, TRUE);

diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 14b274acb07184f075e18c09f802c0e1fe5083fa..9421409f3d67acb71de2230a0b51ddcfc8090bf5 100644 (file)
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -407,7 +407,7 @@ create_window (void)
   gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (flowbox), INITIAL_MINIMUM_LENGTH);
   gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (flowbox), INITIAL_MAXIMUM_LENGTH);
   gtk_widget_show (flowbox);
-  gtk_container_add (GTK_CONTAINER (swindow), flowbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), flowbox);
 
   gtk_flow_box_set_hadjustment (GTK_FLOW_BOX (flowbox),
                                 gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (swindow)));

diff --git a/tests/testgrid.c b/tests/testgrid.c
index 0df805101a3a5ad5b05eac41068199559c0da788..c3c33a9f82905eec27fe6fc3fcb63befa2dd1e4a 100644 (file)
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -263,7 +263,7 @@ scrolling (void)
   grid = gtk_grid_new ();
 
   gtk_container_add (GTK_CONTAINER (window), sw);
-  gtk_container_add (GTK_CONTAINER (sw), viewport);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), viewport);
   gtk_viewport_set_child (GTK_VIEWPORT (viewport), grid);
 
   child = oriented_test_widget ("#800080", "#800080");

diff --git a/tests/testgrouping.c b/tests/testgrouping.c
index b522a439e9be4b6b6ee095ee3f7c534225b4e7a1..a1d44468e52a32dec6965555473c510a6b590baa 100644 (file)
--- a/tests/testgrouping.c
+++ b/tests/testgrouping.c
@@ -129,7 +129,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (window), sw);
 
   tv = gtk_tree_view_new_with_model (model);
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
   g_signal_connect (tv, "row-activated",
                    G_CALLBACK (tree_view_row_activated), tv);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index bd07c664f3c9c0d392544169f663558c692741b7..432dc1d8103831d1704dab08bbf1e5ee00b70ff3 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1548,7 +1548,7 @@ create_listbox (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (hbox), scrolled);
 
       scrolled_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (scrolled), scrolled_box);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), scrolled_box);
 
       label = gtk_label_new ("This is \na LABEL\nwith rows");
       gtk_container_add (GTK_CONTAINER (scrolled_box), label);
@@ -1882,7 +1882,7 @@ scrolled_windows_delete_cb (GtkWidget *widget,
 {
   g_object_ref (scrollwin);
   gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (scrollwin)), scrollwin);
-  gtk_container_add (GTK_CONTAINER (sw_parent), scrollwin);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw_parent), scrollwin);
   g_object_unref (scrollwin);
 
   g_signal_handler_disconnect (sw_parent, sw_destroyed_handler);
@@ -1916,7 +1916,7 @@ scrolled_windows_remove (GtkWidget *dialog, gint response, GtkWidget *scrollwin)
     {
       g_object_ref (scrollwin);
       gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (scrollwin)), scrollwin);
-      gtk_container_add (GTK_CONTAINER (sw_parent), scrollwin);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw_parent), scrollwin);
       g_object_unref (scrollwin);
 
 
@@ -1938,7 +1938,7 @@ scrolled_windows_remove (GtkWidget *dialog, gint response, GtkWidget *scrollwin)
       
       g_object_ref (scrollwin);
       gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (scrollwin)), scrollwin);
-      gtk_container_add (GTK_CONTAINER (sw_float_parent), scrollwin);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw_float_parent), scrollwin);
       g_object_unref (scrollwin);
 
 
@@ -1990,7 +1990,7 @@ create_scrolled_windows (GtkWidget *widget)
       grid = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
       gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
-      gtk_container_add (GTK_CONTAINER (scrolled_window), grid);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), grid);
       gtk_viewport_set_scroll_to_focus (GTK_VIEWPORT (gtk_widget_get_parent (grid)), TRUE);
       gtk_widget_show (grid);
 
@@ -6070,7 +6070,7 @@ create_main_window (void)
   gtk_container_add (GTK_CONTAINER (box1), scrolled_window);
 
   box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), box2);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), box2);
   gtk_viewport_set_scroll_to_focus (GTK_VIEWPORT (gtk_widget_get_parent (box2)), TRUE);
   gtk_widget_show (box2);
 

diff --git a/tests/testiconview.c b/tests/testiconview.c
index 31394c4ac302b2ba3d195dbb4d9a86b6986de0fd..cd40c6e63bbb242603365ca79f1b16324a9decc6 100644 (file)
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -520,16 +520,16 @@ main (gint argc, gchar **argv)
                                         targets,
                                        GDK_ACTION_MOVE);
   gdk_content_formats_unref (targets);
-                             
+
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), icon_list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   gtk_paned_add1 (GTK_PANED (paned), scrolled_window);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tv);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
@@ -578,9 +578,9 @@ main (gint argc, gchar **argv)
   icon_list = gtk_icon_view_new ();
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), icon_list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_paned_add2 (GTK_PANED (paned), scrolled_window);
 
   gtk_widget_show (window);

diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index 1ade83fc038924ef742df36f6eb098f1f3d0079e..90944de2f9b013cbff632d9c16d6a74fe949c890 100644 (file)
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -71,7 +71,7 @@ kinetic_scrolling (void)
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE);
-  gtk_container_add (GTK_CONTAINER (swindow), button_grid);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), button_grid);
   gtk_widget_show (button_grid);
 
   gtk_grid_attach (GTK_GRID (grid), swindow, 0, 1, 1, 1);
@@ -111,7 +111,7 @@ kinetic_scrolling (void)
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE);
-  gtk_container_add (GTK_CONTAINER (swindow), treeview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), treeview);
   gtk_widget_show (treeview);
 
   gtk_grid_attach (GTK_GRID (grid), swindow, 1, 1, 1, 1);
@@ -123,7 +123,7 @@ kinetic_scrolling (void)
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE);
-  gtk_container_add (GTK_CONTAINER (swindow), textview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview);
   gtk_widget_show (textview);
 
   gtk_grid_attach (GTK_GRID (grid), swindow, 2, 1, 1, 1);

diff --git a/tests/testlist.c b/tests/testlist.c
index fb0600ef909e18f16062598d38bbe3ea9848b980..14a6ceb3f8682c1d510df7a28211b1bf62fd0785 100644 (file)
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -290,7 +290,7 @@ main (int argc, char *argv[])
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolled), list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), list);
   gtk_container_add (GTK_CONTAINER (hbox), scrolled);
 
   g_signal_connect (list, "row-activated", G_CALLBACK (row_activated_cb), NULL);

diff --git a/tests/testlist2.c b/tests/testlist2.c
index 244974b9693b8a0519d9d834d3177adfa5daffa6..3dfb4702c29f5983779fa9f88a7771ccfc07c5a6 100644 (file)
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -123,7 +123,7 @@ int main (int argc, char *argv[])
   gtk_list_box_set_header_func (GTK_LIST_BOX (list), add_separator, NULL, NULL);
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_add (GTK_CONTAINER (window), sw);
-  gtk_container_add (GTK_CONTAINER (sw), list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
 
   for (i = 0; i < 20; i++)
     {

diff --git a/tests/testlist3.c b/tests/testlist3.c
index 88d17137162e4627fe0d6a364ec4755c46c6489e..00444ab7772b54ee4c02a65a9350fd010b801060 100644 (file)
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -158,7 +158,7 @@ main (int argc, char *argv[])
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
   gtk_container_add (GTK_CONTAINER (hbox), sw);
-  gtk_container_add (GTK_CONTAINER (sw), list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
 
   button = gtk_check_button_new_with_label ("Activate on single click");
   g_object_bind_property (list, "activate-on-single-click",

diff --git a/tests/testlist4.c b/tests/testlist4.c
index 96deaf3765770194874bd9c5d031012be01c3e90..8f4294e2f5f0d07493800787537a652dcc5e3205 100644 (file)
--- a/tests/testlist4.c
+++ b/tests/testlist4.c
@@ -110,7 +110,7 @@ new_window (GApplication *app)
   list = gtk_list_box_new ();
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
   gtk_list_box_set_header_func (GTK_LIST_BOX (list), add_separator, NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (sw), list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
 
   label = gtk_label_new ("No row activated");
   gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);

diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 5f7c0293b4b0f6bbe487d81706f9c7470856ac84..54b92789f0cb6502d8a0f303e70f7e6f2e41c5ae 100644 (file)
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -247,7 +247,7 @@ test_scrolling (void)
 
   gtk_widget_set_hexpand (text, TRUE);
   gtk_widget_set_vexpand (text, TRUE);
-  gtk_container_add (GTK_CONTAINER (sw), text);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
 
   child = gtk_label_new ("This should be visible");
   gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
@@ -393,7 +393,7 @@ test_chase (void)
 
   gtk_widget_set_hexpand (text, TRUE);
   gtk_widget_set_vexpand (text, TRUE);
-  gtk_container_add (GTK_CONTAINER (sw), text);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
 
   child = gtk_label_new ("Try to enter");
   gtk_widget_set_halign (child, GTK_ALIGN_START);

diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 92e861e7d494378fa37656440fcd43f8320b832a..4243e1e7e922445a2265be0d84db9f3f82d06c55 100644 (file)
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (overlay), sw);
 
   main_child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (sw), main_child);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), main_child);
   gtk_widget_set_hexpand (main_child, TRUE);
   gtk_widget_set_vexpand (main_child, TRUE);
   label = gtk_label_new ("Main child");

diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 23663bf520c456e440672fa8907de7b7f143bd81..af674571d888018815c7350aecb9485a648785e0 100644 (file)
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
 
   gtk_container_add (GTK_CONTAINER (win), overlay);
   gtk_container_add (GTK_CONTAINER (overlay), sw);
-  gtk_container_add (GTK_CONTAINER (sw), list);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
   populate_list (GTK_LIST_BOX (list));
 
   g_signal_connect (sw, "edge-overshot", G_CALLBACK (edge_overshot), list);

diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index c00508288cc4f35033a9f112d292a8aba29d4147..7c181227cfd6fdfa38bb50df39e88ef96ddca584 100644 (file)
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -119,7 +119,7 @@ scrollable_policy (void)
   gtk_widget_show (label);
   gtk_widget_show (viewport);
   gtk_viewport_set_child (GTK_VIEWPORT (viewport), label);
-  gtk_container_add (GTK_CONTAINER (swindow), viewport);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), viewport);
 
   /* Add controls here */
   expander = gtk_expander_new ("Controls");
@@ -232,7 +232,7 @@ scrollable_policy (void)
 
   /* Listbox */
   listbox = gtk_list_box_new ();
-  gtk_container_add (GTK_CONTAINER (swindow), listbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), listbox);
   gtk_widget_show (listbox);
 
   /* Min content */

diff --git a/tests/testscrolltofocus.c b/tests/testscrolltofocus.c
index 8bc6da352f0ac626f59c7e83f32ce370a5b20b4c..58c508344277eb375e3b8301417fbb5c95656be2 100644 (file)
--- a/tests/testscrolltofocus.c
+++ b/tests/testscrolltofocus.c
@@ -15,7 +15,7 @@ int main (int argc, char *argv[])
   viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (sw)),
                                gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)));
   gtk_viewport_set_scroll_to_focus (GTK_VIEWPORT (viewport), TRUE);
-  gtk_container_add (GTK_CONTAINER (sw), viewport);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), viewport);
   grid = gtk_grid_new ();
   gtk_widget_set_margin_start (grid, 20);
   gtk_widget_set_margin_end (grid, 20);

diff --git a/tests/teststack.c b/tests/teststack.c
index 3e0affc23f5164698658bb3d3ea89e4ca076c7d6..079a7ff104b81de7a6395394bb85d144b08bd261 100644 (file)
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -177,7 +177,7 @@ main (gint argc,
 
   tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
 
-  gtk_container_add (GTK_CONTAINER (scrolled_win), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_win), tree_view);
   w3 = scrolled_win;
 
   renderer = gtk_cell_renderer_text_new ();

diff --git a/tests/testtextview.c b/tests/testtextview.c
index 922606ae8341d08a8e73f6b4d6839ff0dbcb4daa..c5918355b44e8235225989dc9bfaaff1413c2baa 100644 (file)
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -193,7 +193,7 @@ main (int argc, char **argv)
   anchor = insert_text (buffer);
 
   gtk_container_add (GTK_CONTAINER (window), sw);
-  gtk_container_add (GTK_CONTAINER (sw), textview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), textview);
   gtk_text_view_add_overlay (GTK_TEXT_VIEW (textview),
                              button,
                              50, 150);

diff --git a/tests/testtextview2.c b/tests/testtextview2.c
index 5e0c4d44537828b65a099afbb572b6e1909756c5..42a7e08f42bbbbf28ce923533bb536088640fd7c 100644 (file)
--- a/tests/testtextview2.c
+++ b/tests/testtextview2.c
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (box), sw);
 
   tv = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
   buffer = gtk_text_buffer_new (NULL);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (tv), buffer);

diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c
index 23d24cdfa16ecfb7482b6ee19f332eb3ce0a9af2..9cfb81ef7427af0730178c8f0280e451d407de7f 100644 (file)
--- a/tests/testtreechanging.c
+++ b/tests/testtreechanging.c
@@ -515,7 +515,7 @@ main (int    argc,
                                                NULL);
   for (i = 0; i < (MIN_ROWS + MAX_ROWS) / 2; i++)
     add (GTK_TREE_VIEW (treeview));
-  gtk_container_add (GTK_CONTAINER (sw), treeview);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
   gtk_widget_show (window);
 

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index a4c1b8dcd066a45f2b0c51303d7dea62f8f8dc96..07002cc8b3e7a2c8d53ca9238efd32c58a0cd481 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -763,7 +763,7 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Top Window");
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_add (GTK_CONTAINER (window), swindow);
-  gtk_container_add (GTK_CONTAINER (swindow), sample_tree_view_top);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_top);
   gtk_widget_show (window);
 
   window = gtk_window_new ();
@@ -772,7 +772,7 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Bottom Window");
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_add (GTK_CONTAINER (window), swindow);
-  gtk_container_add (GTK_CONTAINER (swindow), sample_tree_view_bottom);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_bottom);
   gtk_widget_show (window);
 
   /* Set up the main window */
@@ -791,7 +791,7 @@ main (int argc, char *argv[])
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   left_tree_view = gtk_tree_view_new_with_model (left_tree_model);
-  gtk_container_add (GTK_CONTAINER (swindow), left_tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), left_tree_view);
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (left_tree_view), -1,
                                               "Unattached Columns", cell, "text", 0, NULL);
   cell = gtk_cell_renderer_toggle_new ();
@@ -857,7 +857,7 @@ main (int argc, char *argv[])
   gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column);
 
-  gtk_container_add (GTK_CONTAINER (swindow), top_right_tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), top_right_tree_view);
   gtk_container_add (GTK_CONTAINER (vbox2), swindow);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
@@ -871,7 +871,7 @@ main (int argc, char *argv[])
   column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL);
   gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column);
-  gtk_container_add (GTK_CONTAINER (swindow), bottom_right_tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), bottom_right_tree_view);
   gtk_container_add (GTK_CONTAINER (vbox2), swindow);
 
 

diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 5432002b73f8b5823145fa2590b8307d96db3acb..39ef865a77995b069166aeb19edf6d0d4c61c45a 100644 (file)
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -213,7 +213,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (vbox), sw);
 
   tree_view = gtk_tree_view_new_with_model (create_model ());
-  gtk_container_add (GTK_CONTAINER (sw), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tree_view);
 
   for (i = 0; i < 5; i++)
     {

diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index 1a2139c43f64f708ac2a191cdc2b0f1a975e2ae6..a1d4b3e59cc862b1c726e4aeaece563933406e47 100644 (file)
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -358,7 +358,7 @@ main (gint argc, gchar **argv)
                                               "value", PROGRESS_COLUMN,
                                               NULL);
 
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
 
   gtk_window_set_default_size (GTK_WINDOW (window),
                               800, 250);

diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index e7c90662d72c851dda8fc6b781bf0c5bfbe83842..a6381318716452c16e08797e7559d59f7baf4ede 100644 (file)
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
                                               gtk_cell_renderer_text_new (),
                                               "text", TEXT_COLUMN,
                                               NULL);
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (vbox), hbox);
   button = gtk_button_new_with_mnemonic ("<b>_Futz!!</b>");

diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index 87c5fec4af82f23cb82aa0badc07b28286a95a8f..a89fd74015b1c6c0995d1b33a29fe351ae6e4816 100644 (file)
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -466,7 +466,7 @@ main (int argc, char *argv[])
   gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
 
   g_signal_connect (tree_view, "realize",
                    G_CALLBACK (gtk_tree_view_expand_all),
@@ -536,8 +536,7 @@ main (int argc, char *argv[])
                    G_CALLBACK (gtk_tree_view_expand_all),
                    NULL);
                           
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
 
   gtk_window_set_default_size (GTK_WINDOW (window),
                               650, 400);

diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index fcd1590060d9a94e46c92b9b981a79a3631b9117..5625d2631e185f39453612e923eadf4304d52acf 100644 (file)
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -97,7 +97,7 @@ int main (int argc, char *argv[])
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_add (GTK_CONTAINER (window), sw);
   tv = gtk_tree_view_new ();
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
   col = gtk_tree_view_column_new ();
   cell = gtk_cell_renderer_text_new ();

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 5f07c6b80db94e4b33f64dd6451352d7c5c20052..4cf69048978564a298604a54c9684e390f5cea8b 100644 (file)
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -235,7 +235,7 @@ main (int argc, char *argv[])
                                        WORD_COLUMN_1,
                                        GTK_SORT_ASCENDING);*/
 
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
   gtk_widget_show (window);
 
@@ -299,9 +299,8 @@ main (int argc, char *argv[])
       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (smodel),
                                            WORD_COLUMN_1,
                                            GTK_SORT_DESCENDING);*/
-      
-      
-      gtk_container_add (GTK_CONTAINER (scrolled_window2), tree_view2);
+
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window2), tree_view2);
       gtk_window_set_default_size (GTK_WINDOW (window2), 400, 400);
       gtk_widget_show (window2);
     }
@@ -367,8 +366,8 @@ main (int argc, char *argv[])
       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (ssmodel),
                                            WORD_COLUMN_1,
                                            GTK_SORT_ASCENDING);*/
-      
-      gtk_container_add (GTK_CONTAINER (scrolled_window3), tree_view3);
+
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window3), tree_view3);
       gtk_window_set_default_size (GTK_WINDOW (window3), 400, 400);
       gtk_widget_show (window3);
     }

diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index f7843dc67cf5d845241e4236c3fc9cb0dd09d7d1..534a6f0f6e679116512d9294ae1e0c1e5f14fc14 100644 (file)
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -755,7 +755,7 @@ main (int    argc,
   
   gtk_container_add (GTK_CONTAINER (box), sw);
   
-  gtk_container_add (GTK_CONTAINER (sw), tv);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
   
   gtk_widget_show (window);
   

diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index 23ea1ddcd769b2a4f1a55476e0f44494454d40ad..aaead5a21ba2dbd525772b3ffdb7487d466b849d 100644 (file)
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -377,8 +377,8 @@ main (gint argc, gchar **argv)
 
   gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
 
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-  
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
+
   gtk_window_set_default_size (GTK_WINDOW (window),
                               800, 400);
 

diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index c461c25b37e477b27836eaaac7846e2bb4d7af5a..d8a3430b86ea9a44bc0fc9ce197dc74338007898 100644 (file)
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -342,7 +342,7 @@ make_window (gint view_type)
   gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_SELECTION_SINGLE);
 
   /* Put them together */
-  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
   gtk_widget_set_vexpand (scrolled_window, TRUE);
   gtk_container_add (GTK_CONTAINER (vbox), scrolled_window);
   gtk_container_add (GTK_CONTAINER (window), vbox);

diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c
index debbca5b1e845ff738e520346186d97dd1afe4f2..f5c7d588a2b219f28dda3713223cf08e4f74b738 100644 (file)
--- a/testsuite/a11y/children.c
+++ b/testsuite/a11y/children.c
@@ -40,7 +40,7 @@ test_scrolled_window_child_count (void)
   g_object_ref_sink (sw);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS);
-  gtk_container_add (GTK_CONTAINER (sw), gtk_label_new ("Bla"));
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gtk_label_new ("Bla"));
 
   accessible = gtk_widget_get_accessible (sw);
   g_assert_cmpint (atk_object_get_n_accessible_children (accessible), ==, 3);

diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c
index 9f03174e59c3dd955a7ec0bf68da1eff4280fd2f..8cabbd926bd70a9a7b084bb56552a6da6a9b56f8 100644 (file)
--- a/testsuite/gtk/scrolledwindow.c
+++ b/testsuite/gtk/scrolledwindow.c
@@ -29,7 +29,7 @@ test_size (gboolean       overlay,
   gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE);
   gtk_scrolled_window_set_overlay_scrolling (GTK_SCROLLED_WINDOW (scrolledwindow), overlay);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), policy, policy);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), box);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), box);
 
   /* Testing the content-width property */
   if (orientation == GTK_ORIENTATION_HORIZONTAL)